(cherrypick of 8ad0e66e77c795d11e9cd5c7b576eed0da60537e.) Bug: N/A Test: builds Change-Id: I700700abb4de76017a2ff811ceff19ea2ee86eb2