Bug: 11737760 Change-Id: Id50a7d393acf755cb04d3f8dc60327abeee5a671
cherrypick of Ib930ba810b25e28bcc36ea1647d46731816d9def Bug: 11125351 Change-Id: Ifc4ab2a0495e886259c34f78bbe8cbf8fb75203b