Reconcile with gingerbread-release

Change-Id: I5a9cde4afd6b2bc4a02eda27c9d919ebfd322d1d