Change-Id: I5d4ec43dd7eb3c2512d330262cceceda4c3a55eb
Closes-Bug: #1721200
(cherry picked from commit b4d8247f)