Merge changes Ieef54d84,Ica3e88c2
am: 491f53523a

Change-Id: Ia60c1dd733a8de0e777dce78cde67738f6d466bd