Merge changes Id4d040ea,I318fb1fc into mnc-dev

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