Merge changes I2d6bb0c1,Iedc23f15
am: 2a072938e1

Change-Id: I46b337b9f201761bb62216302fca288989382e83