Merge changes Ica52e8f0,Id0ee07f9 into nyc-dev

* changes:
  [DO NOT MERGE] Update platform security string to 2017-10-05 in nyc-dev Bug:64896113
  [DO NOT MERGE] Update platform security string to 2017-10-01 in nyc-dev Bug:64896113