Bug: 31490566 Change-Id: Iaae2c5ef2a856ae265d4e4ea933d714491744e49 (cherry picked from commit acc0a448) Merged-in: Iaae2c5ef2a856ae265d4e4ea933d714491744e49