Fix some NPE issue

Test: unit test
Bug: 222020304
Bug: 222070055
Change-Id: Iadcdea01127bdec134ef091a562c36e81fdc8630
Merged-In: Iadcdea01127bdec134ef091a562c36e81fdc8630
(cherry picked from commit 2b2c26bf712ea8872604b4797c316ad363ca2f07)
1 file changed
tree: 6177f9ab7d4574262e4e50ad35fbbac7fae765e3
  1. nearby/