(cherry picked from commit ea216b3a) Bug: 18000316 Change-Id: Ic828e8be8e5d3ef7e112facd0db57013740d449a