Merge "Set up configfs" into nyc-dev am: 290127b
am: 7972040

* commit '7972040588b1921c743d93a68435e095cb352858':
  Set up configfs