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

Change-Id: Ic37df35542dcb27b88401bb4efa59cb2113dbbd7