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

Change-Id: I7c858495e9c14b93e0bf3efc7598be76c4f7f380