Reconcile with gingerbread-release gingerbread-mr4-release

Change-Id: I6e271c4fbcb138e695fb21c268df7d83efb5484f