Merge changes I5e589b2b,I821a700c am: 2684d0b9a2
am: 78f40f8574

Change-Id: Ideae490c7384acb86f06573617884aabdbe88882