[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
am: 05965e37e6

Change-Id: Ic1311cbf4fe550f7789f62588828299f8248518a