Merge 55e124c4 from gingerbread-plus-aosp

Change-Id: I8b428792ced31b73e8cc3743ab38e157578e9377