Merge cherrypicks of [3310659, 3311062, 3310913, 3310647, 3310648, 3310649, 3310650, 3310651, 3311172, 3310601, 3311109, 3311193, 3311213, 3311214, 3311215, 3311216, 3311217, 3311218, 3311219, 3311220, 3311221, 3311222, 3311223, 3311063, 3311225, 3311252, 3311253, 3311254, 3311255, 3311256, 3311258, 3311259, 3311261, 3311262, 3311263, 3311264, 3311265, 3311267, 3311268, 3311269, 3311270, 3311271, 3311312, 3311313, 3311315, 3311317, 3311320, 3311322] into oc-m4-release

Change-Id: I367328f711b7c70352b6e4ddc2a6494fa20b3126