Merge changes from topic "discard" into oc-dev

* changes:
  [automerger skipped] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs skipped: 632208951a
  [DO NOT MERGE] make_f2fs: issue discard commands on mkfs