am 12df73e9: am 2d883a90: am a1db5fae: Merge "Fix for NPE in CLF" into ub-gmail-ur14-dev

* commit '12df73e9e421c3136a82c34e40d40f4aebdfc2c9':
  Fix for NPE in CLF