This change must be checked in together with Iac93eb79fc. Bug: 12913520 Bug: 12179576 Change-Id: Ic9a40fb0529202893be8ccb6f5abfbbe6d78508c