Merge changes I44124d22,I8d01048f
am: 05ffbaed02

Change-Id: Icdc2dab8de1d88eda6ce77547362b40d53ab8cee