Remove some duplication of validation logic

Remove some duplication of validation logic, add a missing annotation
and tidy up argument name.

Bug: 140712361
Test: treehugger
Change-Id: I8b47f9b6732adb8584f91a1ad5dd2418da22b61a
1 file changed