Merge changes Ica4f766c,Iaa97520d
am: 195ea635e6

Change-Id: Ib5496ee43f4cec79279f5eb8c0eec90fb2dda0fb