Merge changes Ia0c0018c,I2f1fc8b4,Ibe964c3b,I791da8ac
am: 9da992c271

Change-Id: Iea6c640fc20f1586b5ebb1ad7a6308b5c70a992d