Bug: 29011117 Change-Id: Ie9e359c3ee079c2cecc33f11cfff7c0dc6406be1 (cherry picked from commit 7ee53be3)