Merge "Remove some duplication of validation logic"
am: d8aa23e1ca

Change-Id: I1743319b189cdc4af06236b2bac84bde8bc842f2