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

Change-Id: I08912f25f9b51838a92322dba55bf1934d6302c4