Merge "Refactor client platform checks to be DRY."