Merge changes I2ce11db5,Idba8278b
am: dd3f863499

Change-Id: I811fb4b61aed0ee6324b48aff2a8b3dfa4581b86