am 4430b1c9: am e94bf367: am f2098eab: am d461d9be: Merge "Avoid potential NPE in CVF" into ub-gmail-ur14-dev

* commit '4430b1c9129bc8ce526a7cab41e734f5bc25edf1':
  Avoid potential NPE in CVF