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

Change-Id: I37c9cd7932677faa96c9d1cd87a4ec7fdca99bf8