Merge "[DO NOT MERGE]Update Security String to 2018-04-01 in oc-dev Bug:73240847" into oc-dev