(cherry picked from commit 99e6d2d9) Bug: 28977632 Change-Id: Id37d90446be5d63cb0cf0131e34b562147e88335