am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to...
am 6dfd6aec: am c8c5e98b: Merge "Document some of the more common mimetypes to be used when instantiating" into jb-dev
* commit '6dfd6aec':
Document some of the more common mimetypes to be used when instantiating