This CL must be checked in together with I6a9ac172a5. Bug: 14042743 Change-Id: Ic3f01f5d10097d743325df847bd7cd2959992487
9bd6dac470