am bb77d99c: Merge "Directories are always enabled; update assets." into klp-dev

* commit 'bb77d99c257bc4a3371548c4bc8ba7088fa76005':
  Directories are always enabled; update assets.