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

Change-Id: I2f1bf05893d536418adcbcf4203fdaf56768ca5d