Merge "fs_mgr: fstab: logspam from empty flags" am: bece53e515
am: 50574de69a

Change-Id: I23b6fe786b31918553855b031b0742db810de16f