Merge de8635e4 from gingerbread-plus-aosp

Change-Id: Ice15f34cc3ab7d938d8acde1033886b2765fee9d