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

* commit 'cc7900e367e86003f5a7d2e1c28246a64d94e89c':
  Prevent rare NPE