Merge cherrypicks of [2584909, 2584910, 2584911] into oc-dr1-release

Change-Id: I010324d640cee88df7ebee828199f5c811b390b6