Bug: 168805198 Change-Id: Idcc7d00b0f23c2a0f9be6f0ab2600278e18cc1a3 (cherry picked from commit e6477328aa)
e6477328aa