No-op - reconcile with open-source gingerbread

Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e