Merge cherrypicks of [3199316, 3199473, 3199281, 3199021, 3199022, 3199023, 3199317, 3199318, 3199319, 3199320, 3199455, 3199085, 3199261, 3199246, 3199335, 3199247, 3199209] into oc-r5-release Change-Id: I76c23db9fe41d7d3cb06a83179d633785a6c992d