Merge cherrypicks of [2938191, 2937681, 2937682, 2938081, 2938082, 2938083, 2938084, 2936625, 2936626, 2937945, 2937946, 2937947, 2937948, 2938729, 2938192, 2938193, 2938194, 2938195, 2938196, 2937683, 2937684, 2937685, 2938085, 2937965, 2938197, 2938388] into oc-r4-release

Change-Id: Ib6ae1240a59955e1b8d50315e880dcd7f8c53622