Merge changes I5c252cba,I80259eef into mnc-dev

* changes:
  [DO NOT MERGE] Update Security String to 2017-06-05 for mnc-dev
  [DO NOT MERGE] Update Security String to 2017-06-01 for mnc-dev