am 50d5152f: Merge "Code cleanup." into jb-ub-mail-ur9

* commit '50d5152f54060fa6a491e8f10411d02f13a09b83':
  Code cleanup.