Bug: 2160782 Change-Id: Ib1eb2e9e3fe3a7b2ad16387dbf888646a1195221
bug: 2160782
BUG=1800118 Automated import of CL 147804