Merge cherrypicks of [3817158, 3816875, 3817606] into oc-m2-release

Change-Id: If98723f88a5a9b5b45f7b8739bf91a2a5cb67841