Reconcile with gingerbread-mr4-release

Change-Id: I4306273ad563fc15e0d620fc420acf26171d9a4a