Merge changes I96d1acb3,Ief00af72,Idf8f4a0e
am: 3d85fc6954

Change-Id: I2c0ba6f1c572ddc01173b8f3cdea271a6e37ff0a