am a0f02fa9: Merge "Fix the fs_config call."

* commit 'a0f02fa9e3ca779ed69264fc0977f530328c3f15':
  Fix the fs_config call.