Merge changes I7c8a25a2,Ifb32d061 into oc-dev

* changes:
  Updating Security String to 2017-09-05 Bug:63846344
  Updating Security String to 2017-09-01 Bug:63846344