Additional personal tweaks+removed f2fs error

Change-Id: I62fbe9c33bb1f2261e2f34298d08e968d2156f22