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

* commit 'e5e3cdf9b31599125116ca906894db7e13453123':
  Fix for NPE in CLF