Also auto fix some lint issues. Bug: 243337537 Test: Manual Change-Id: I55a393517ae01d6a8c17106a3e7750323838cebb (cherry picked from commit 67599bce4e) Merged-In: I55a393517ae01d6a8c17106a3e7750323838cebb
67599bce4e