This is a hotfix. If you think it's better to revert I2e6195b instead please do so. Bug: T134351 Change-Id: Ifcc832a731b18933bdf6edfd6eb7a5cd6046c3ba