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

Change-Id: I02f2924417a8627135c559113b868ea2e8e40ca4