Merge cherrypicks of [2549122, 2549155] into oc-release

Change-Id: I4bea635e9e668a766a611c1266effc0aa659304c