Merge changes I2eef0a3c,I263a1774 am: d378647589 am: 7f5c1132fb
am: 8821960614

Change-Id: I18b5c52d8dc742053144d996ca17befca657053d