am 040b9311: am 56ee04e1: Merge "Adding some missing files." into jb-dev

* commit '040b93110cc1183d646ad148993bb1c9e6ceb71c':
  Adding some missing files.