DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01 am: 0bdac8fba3 am: 2ee84bf0a5  -s ours am: e495d379de  -s ours am: 8b961c808b am: 3cba9b15f7 am: 8ebaeae1f6  -s ours am: 9ae8c7356e am: bc60af7bfd am: 37e618fef8 am: c3d3f6bad9  -s ours am: 2af23a3c20
am: 4ace3d2075

* commit '4ace3d207522a81a4ea4ba9fb50a01b7b7a76898':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: If7b75fa6c8e965ecec9bfc7b394408d62eeea5ea