Merge 66888a7c from gingerbread

Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06