Reconcile with gingerbread-mr4-release

Change-Id: Ie84c92e64a80acd336d44d8bb31bfe48c03a06e6