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

* commit '3346da0a93f60a7039581e48182be347dcceabec':
  build: update fs_config calls for capabilities change.