am 9d05bd8c: am 1d56afc6: Merge "Revert "Deprecate"" into jb-dev

* commit '9d05bd8c67b6c01436bfdde13ef9fe61cf9f33e9':
  Revert "Deprecate"