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

Change-Id: I335fdb5f3053569036608300f8a324a840517cde