Merge change 2472 into donut

* changes:
  ADT #1877529: Fixes a couple potential NPEs in content assists.