Merge changes I30f397b0,I717a6f03 into lmp-dev

* changes:
  Updating Security String to 2017-01-05
  Updating Security String to 2017-01-01