am 33b190f6: Merge "build: update fs_config calls for capabilities change."

* commit '33b190f6c6653b3c3493c725a96ff340c4466604':
  build: update fs_config calls for capabilities change.