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

Change-Id: Ifc99fbd51a498d97d10dff1492b0743e9c9f33c4