Merge "Trivial change to test expectations." into oc-mr1-dev
am: 9487f80cc5

Change-Id: Iad2aad7163aea9b1b92ed3f46be7ce36cd0578c6