(The original change is 3b4c1893.) Bug: 11003273 Bug: 9986565 Change-Id: Iaaf6395f171eb6e6b8c99386c20c4970c53ee00d