Merge changes I1c0be5f8,Id837c19a am: a39685735c am: a2c458dac7 am: b1ec15a4a8 am: aae681421b

Change-Id: I8dbcb610fc2203923c1ba5dd623d1a920f0cdc6d