Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I2e05e29384ce13de26514fd1e120c00cd0e39112