am 31791769: Merge "Minor cleanup" into jb-ub-mail-ur9

* commit '31791769023b170774097e19379bcc493f9452e7':
  Minor cleanup