[DO NOT MERGE] Updating Security string to 2017-07-05 on klp-dev bug:38342695 am: e2d22d501d am: 54f2af92b2 am: ad8ec7f781  -s ours
am: bf2d4968da  -s ours

Change-Id: I5cd9534838910791e689a6659480d1862785ef10