Change-Id: I2a44e3843dd25b9db387c12f536a084d1fafbcd1 Closes-Bug: #2004538 (cherry picked from commit b1a4f783da)
b1a4f783da