am 90ec8e01: am 17553ce2: Merge "Prevent rare NPE" into ub-gmail-ur14-dev

* commit '90ec8e01796fcbb16cca0452177bf1ffee53a311':
  Prevent rare NPE