Merge changes I1c0be5f8,Id837c19a am: a39685735c am: a2c458dac7

Change-Id: Ie4cb676eb5d2193dd8359f9e33e363c73a3c0d2c