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

Change-Id: Ifbbbbc6483792af7032fb59af068dc277a228d37