Merge "DO NOT MERGE: Update Platform Security String to 2018-07-05 for oc-mr1-dev Bug:79883349" into oc-mr1-dev