Bug: 29412469 Change-Id: Id884851a12f95c89f928b81f5b5baa1f9f80fafe (cherry picked from commit 0a726ac6)