Merge changes from topic "sload_f2fs"
am: ec87074542

Change-Id: Iaf5d4202a1b3d74be00b9e6be0fd85434ba3477d