Merge "fs_mgr: reorder getting boot config"
am: d0687a8aec

Change-Id: I37713926cb7c645929e037f570527ec770b0557a