Merge changes Ic190bd8c,I865044c8 am: 5d0f40f7c5 am: 94eac36e98 am: 226144468b
am: 5ac2d1b99a

Change-Id: I1334504dbd8c73ce4ba461720b926d9be4f38440