Merge "Disable presubmit for ActivityRecordTests" into oc-dev