Merge changes I0cad28e7,Ibecda05f
am: 564c41f33b

Change-Id: I2c304b3f00c88c7e82d33545a77c3b4b366a7b27