Merge "Removed unused or unnecessary defines" am: 00622c4686 Change-Id: I2b77bc96f1bef67ea29ff8382dd2e76841acc321 GitOrigin-RevId: 750552a9ee491e76f9bbb0e2cc50d667d9b9a99b