Change-Id: Iebb70cea8483b6f0a577ab6b8d8015c39fba6345 Closes-Bug: #1623006 (cherry picked from commit 493ce1927f)
493ce1927f