DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:...

DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa am: 0bdac8fb am: 2ee84bf0  -s ours am: e495d379  -s ours am: 8b961c80 am: 3cba9b15 am: 8ebaeae1  -s ours am: 9ae8c735 am: bc60af7b am: 37e618fe am: c3d3f6ba  -s ours
am: 2af23a3c

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

Change-Id: Ia0b764a4ff323bd52e92d0c1814e0940ed3dfd2d