am d573622d: Merge "Miscellaneous cleanup" into jb-mr2-dev

* commit 'd573622dc001c23223cb26b1f55fb75be189e77d':
  Miscellaneous cleanup