Merge "fs_mgr: Fix kernel command line parsing" am: 38ff80810a
am: 84d0fc3e4b

Change-Id: Ia65c542c51477a4ae2ca172c3e2879c1da0d7201