Merge "Suppress error log coming from libfstab operation"