Merge changes from topic "sload_f2fs" am: ec87074542
am: a22b237d05

Change-Id: I2d86e6869d88b1278ef60d774298c58f238eca72