Merge changes I53c2c560,I7d845ac5,I8b11d923
am: b4fda18d83

Change-Id: I1901e4dfe4d5d59b0ebfa018bb79d0827d22ba05