Code inspections

Fix some low hanging fruit code inspections in Android Studio

Change-Id: Ib3845d2a65a37b7dbef8c619fcce3a3d6d59afcd