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

Change-Id: I0c2551c5fdc0a2071c8fb40ffc74869591cf74bb