Change-Id: I7dc0b0d26220d6eb82f956a9860cfb6aeccfd12f Test: none Bug: 30511606 (cherry picked from commit 902316d553)
902316d553