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

Change-Id: I11db4139682d9845820e1718b1d585f54115a546