Merge changes I0c45635b,I2201d0e4 am: ac08994fde am: fbec51123c

Change-Id: I5772a6f710c3550218cf7ea2403445bfe2960003