Merge changes Iaa6f0d65,I68a16b64 am: 23d84d343b am: 2f8ac6dd48

Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2