(cherry pick from 3842b1a5f6) Change-Id: I100a5071c059fe9fa85bbdc33db552b16d7bdf60
3842b1a5f6
6e78a2c5
6eec17e3