merge 6d0d0d64 from gingerbread-plus-aosp

Change-Id: I6b9bb3380fc74414542a8875b8afa09b391d29c2