Bug: 38175945 Test: none Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6 (cherry picked from commit 6b1f3950)