Merge changes from topic 'am-d9574ec3-14e0-491c-896c-32c57a3dcdf2'

* changes:
  Special case Tachyon mimetype am: acda280ae8
  Special case Tachyon mimetype