Merge changes I46d9d8c1,I1ea15c14 into nyc-dev

* changes:
  [DO NOT MERGE]Updating security string to 2017-07-05 on nyc-dev bug:38342695
  [DO NOT MERGE]Updating security string to 2017-07-01 on nyc-dev bug:38342695