Bug: 18007548 Change-Id: Iecd1303feeb8062741752862312043ecd75cebbe (cherry picked from commit fa81d212)