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

Change-Id: I55b9421bc2e4f309e6705b349a77d4ec9fd3839d