tree 564647612f8c22a88f26d9d975e95521834ca0ba
parent 7f2331003af41521291eb277f5f7c5bc290d948e
author Chalard Jean <jchalard@google.com> 1590639879 +0000
committer Chiachang Wang <chiachangwang@google.com> 1591059786 +0000

Fix an NPE

Also opportunistically remove similar useless calls

Bug: 157433005
Test: manual
Change-Id: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
Merged-In: I818bce247dd9d59405d3cdae25e69ce7e6c61ba6
(cherry picked from commit 30379cd5f95b96b5cd909df73d315576d8850f76)