Merge from gingerbread-plus-aosp

Change-Id: Ib645dbd78ffc393b6cbe568d9a351ced2d3adc30