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

* commit 'd461d9befcd444c986a298cf0f2f80cd2b5e7dfc':
  Avoid potential NPE in CVF