Merge changes If8747ba1,Id1943ebd
am: 69ba5179f4

Change-Id: I2bf0d93e49d1331589d71efb98ce89a9822c7064