Merge "Updating security string to 2017-08-05 am: d6e984f9e3 am: c5c1af423a" into oc-dr1-dev-plus-aosp