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

Change-Id: Ie3454c632ed03657aae7bcb0769983c5de30b118