Merge changes I2eef0a3c,I263a1774
am: d378647589

Change-Id: I23aafa551c3b17ef4f97f89602bd089324f63b4d