Merge "fs_mgr: fstab: Fix parse warning typo" am: 4ddb495354 am: 1b378271f4

Change-Id: I3234070728b4f6c91ab2260713155070f7525c61