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

* commit '075f3b962e253d1f74aae88cd5445671c0ff6c14':
  Code cleanup.