Change-Id: Ibf6bfde6c524821fa5dc3c01b2eb57635e587de6 Closes-Bug: #2039463 (cherry picked from commit bfdc99ffbb)
bfdc99ffbb