Merge cherrypicks of [3788119, 3788120, 3791370, 3791345, 3789992, 3790410, 3788121, 3789993] into oc-m2-release

Change-Id: I723430c94f499aed2f735eaae9b2fa0c3e6b3592