Merge changes Iaa6f0d65,I68a16b64 am: 23d84d343b

Change-Id: I687e59f2c25d5c5e2cb5b1574dbcf6f32ec8c817