This change must be checked in together with Ifde70b1d3b. Bug: 10587358 Change-Id: I9dc48f9d521e0e6f6269e4f184389ba805f3053f