Merge "Trivial change to test expectations." into oc-mr1-dev