Merge changes I10c01f2b,Ie05bc535 am: 277d42a035
am: 47a589c945

Change-Id: I5501ba7eb04493b5de84feaeadb53b57de89e8d2