Merge 35ac4e1d from gingerbread-plus-aosp

Change-Id: I3a0c1f0da2329cdff49ff384d3533ba9d6d0182f