Merge changes I104e6133,I54f04c03 am: 191ddb0c27 am: 80c75db311
am: a827c78a96

Change-Id: I2710dafa1734e23ed97341372a4006d007ae4e37