Merge 34afc2cd from gingerbread-plus-aosp

Change-Id: I2471571af1d8e34e7270cb6f765f16b4a474bb28