Fix Static code warnings

Bug: 404976330
Test: Manual
Change-Id: I08f0ae58e2dbdee5a42ad750684397ff6a394919
2 files changed