This CL must be checked in together with I6ebfbeb4e8.

Bug: 11866784
Bug: 15781377
Bug: 13888366
Change-Id: I57d47ab174d03121a604fd0dbf553795de0ab9b8