Merge cherrypicks of [2676137, 2676468] into oc-release

Change-Id: I7bcdde729e05c808e47ede577ba574bc20c3568b