Bug: 27931085 (cherry picked from commit 24a4fdf9) Change-Id: Ie0b15d5fc94c2bb6d3707ecf985f6f72110e4d68