[automerger skipped] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs skipped: 632208951a am: 7b0210bcbf  -s ours
am: d81c4501e5  -s ours

Change-Id: I0196177e94d55892922a55eef7070d6de6c954cb