Bug: 137202333 Test: Build & unit test Merged-In: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9 Change-Id: Ief8d20b62df5fcd99980182d9bb896bd82ac70e9 (cherry picked from commit 324606e4)