15e58b4023
Bug: 117921091 Test: all tests should pass Change-Id: I5d60a1177d43eb8dec08403cf34936007b8a267f (cherry picked from commit c1409f44f82313902a690fb257ee271dc16385a0)