This reverts d077dbf4 because the issue was resolved. Bug: 161331016 Test: m lint-check Change-Id: Ic4a2025407caeb6d41db3b84a293dc249f77ad0b