Merge changes I1c0be5f8,Id837c19a am: a39685735c am: a2c458dac7

Change-Id: I850a1c93ea2222ac5d503deea32b3cf0a66200a5