Change-Id: Iba533f795f78bcd74d5989eff9ed9342c66d05b0 Closes-Bug: 1638605 (cherry picked from commit 57bbc76a78)
57bbc76a78