Merge cherrypicks of [2647875, 2648067] into oc-release

Change-Id: I21c55ad8fe10d90fab0ab8d26ea11e1d927dabba