5ed87e4c96
Bug: 199495917, 218973952 Test: https://android-build.googleplex.com/builds/abtd/run/L37100000953023420 Change-Id: I355b4ec0806755f6c72d59b04555b970ca1578f5