Bug: 24260668 Change-Id: I20733e52dbd2dab5eb10b4607a1c1aadb93a1332 (cherry picked from commit cd860ac06c)
cd860ac06c