[automerger skipped] [DO NOT MERGE] make_f2fs: issue discard commands on mkfs am: e42a494592  -s ours am: 343ce09289  -s ours
am: f05433ed02  -s ours

Change-Id: I8fe0e04a4d22b55da8328618f90fb32111f37850