Merge 13212f83 from gingerbread-plus-aosp

Change-Id: I9a8ee0c7e7896aea85e7a7c18ee82927091cb670