Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11 am: 1740e8698d

Change-Id: I826f1f94ea62eb5bd93e5d7edcbe278c8247ae2d