Merge changes I978ac321,I5675a80c,I56ef3cc4,I1cdaf002 am: 2ff0a7bd58 am: 3bb4823ce5

Change-Id: Iccbb591430093ac42fa813648fa4ece4b17a0ea3