am e0fbae30: Merge change 2472 into donut

Merge commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f'

* commit 'e0fbae303c71b1be68e581e9b686e8a0104e657f':
  ADT #1877529: Fixes a couple potential NPEs in content assists.