Merge "fs_mgr: remove the repetitive and annoying bootconfig error print" am: 515e7a4fc4
am: d1078c42ce

Change-Id: I2b735716342c046cd160a4a16a16911dbe53574a