Merge "fs_mgr: allow boot_devices to be supplies on the kernel commandline" am: 8f1fcd5b94
am: 0be6513e9a

Change-Id: I3165876277b3efe93f86cc8ebc8f56e67cf068cb