Merge cherrypicks of [2640856, 2640242, 2640243, 2640244] into oc-mr1-release

Change-Id: I5fda2b8e93fab2525bb88827fcc1a25509c57616