Change-Id: I6123c3be9d8e9b86b3517fca0767994a0432dfc2 Closes-bug: #1539453 (cherry picked from commit cdb7e22a14)
cdb7e22a14