Bug: 2160782 Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
BUG=1910893 Automated import of CL 150381