Merge changes I1b2e34d5,I75ae5b29
am: 9ffa786b56

Change-Id: I2cd8033fd8373c0d7e1f62dccc1ac472b44a6d66