This CL must be checked in together with I1db2e848ab. Bug: 16522808 Change-Id: I08a1b0c300c504def609cbb53462d215d1ead15c