This CL must be checked in together with Ie45df15b18. Bug: 11866784 Change-Id: I44d6ceb45108be135e3eaa361f4ee2c83f04fb57