am 99e66178: Merge "Code cleanup." into jb-ub-mail-ur9

* commit '99e66178b9ba76a4aed9805d6929c6756056ac4f':
  Code cleanup.