[automerger skipped] [automerger] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: 17705ce009 am: 5035821535 skipped: d03107eda1
am: f6d96f1321  -s ours

Change-Id: I5e742fe7e87e0e6b48a8f6c14eafcc2e8d54e967