Merge changes Ic190bd8c,I865044c8 am: 5d0f40f7c5
am: 94eac36e98

Change-Id: I2fe9bc552f1607bce87e832aee7971386e738af5