Bug: 276486398 Change-Id: Ic39fea77d99e476d6e236064292b006406096523 Test: n/a (cherry picked from commit 8249f319)