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

Change-Id: I737fa4a3b8f172d6600053ba2a9948eabb7d6a89