Merge "Fix ActivityRecordTests." into oc-dev