Merge "DO NOT MERGE Updating security string for oc-mr1-dev to 2018-05-05" into oc-mr1-dev