Merge changes I5e12b2c7,Ic79effb1 am: 0141bbe644 am: ae36a0b59b

Change-Id: I1ed7d32d85e20cccb461d2f2e7acf1efca7d2539