am ad59e0a9: am c92961dc: am b905f121: am 9796a83a: Merge "Add shared app gid to fs config"

* commit 'ad59e0a90ec414ddc59cbe73319039981f433c53':
  Add shared app gid to fs config