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

Change-Id: I1c2d70d7db1ef74db40e379966b393f15a56022c