Merge changes I6a14ac96,I996b9885
am: 4b187d2bc9

Change-Id: I2db69305871078ec4a3ac185063f79a505190a76