Merge changes I891f64fb,I6182d84e
am: 1fd4b364fc

Change-Id: I2db90f207c6ad337dc40cc7df1cecaf5a38760c3