Bug: 134120683 Test: make Change-Id: I618031968a4131ee153994deca55d192cbc598b3 (cherry picked from commit a1f05cc4)