Merge changes I52110b84,I15d10a19,I5f52b832,Ifbaceb47
am: 803648a957

Change-Id: I8e38dc0a07d8bee013e29e3433ae00d745748e97