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

Change-Id: I3817bafd8c00b118c2badc83b7d3598abee43482