Refactor: improve null safety by using empty list instead of null

Change-Id: I443942ef82819e0c27df2c2acd45eb9106038992
5 files changed