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
* commit '2ee84bf0':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768