Merge changes Iddb0cb1e,Ic15e0b08,If1c9adb6 am: 2b17afc68d am: f1477d7f43
am: e8f700611e

Change-Id: Idc9bc1ea27eabd51853b254141177407d607115d