Merge cherrypicks of [2640576] into oc-r2-release

Change-Id: I1cb78ad314ccf843c2728219e1dbbcf064fda0c5