Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp * commit 'b9a40068b590b86904b40bf466571b140d0f94b4': Failing test cleanup.
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp * commit 'b9a40068b590b86904b40bf466571b140d0f94b4': Failing test cleanup.