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

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