Fix some static analyser issues

Bug: 27099772
Change-Id: Ic96777edf4ea282be2b8f53525226396c01e023c
1 file changed