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

Change-Id: Iaac5d1a04fc11d3b3535bd5c5833784fecabc770