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

Change-Id: Ifc0462a361684da983f07b6722d80e86159acdd3