Merge '5f62213e684dbea03b5a2bb732405a03ccc1a815' into master am: 5dfd96a0b3 am: 780068d4ee

Change-Id: Ib5aa59c512fa91a23f84e24cc87b301d27e0e4e8