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

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

Change-Id: Ifb8352e7397a3a80ce5041bf74e95c609cc7c754